Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Apr 2012 22:55:58 +0000 (15:55 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Apr 2012 22:55:58 +0000 (15:55 -0700)
commit9cb4fa2a15e20db46305e6c292b10dd9c16df538
tree355334c3ed3e37639d8e09a68745caa9bf02b477
parentbeedf0d7fdfd89babf3a67ebc3faba0acd8f7518
parent0bf9f02692ce21c1273c6e8ec3954ff406ea4061
Merge from trunk.
src/ChangeLog
src/Makefile.in